From afdb3f2ee804c12aabfc6a142723bea0b6d0128e Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Mon, 5 Jan 2009 18:05:22 +0100 Subject: [PATCH] Update signature for gdk_window_quartz_show and adapt the implementation --- gdk/quartz/gdkwindow-quartz.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index c5f2e4e6db..309edf338e 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -1059,25 +1059,16 @@ all_parents_shown (GdkWindowObject *private) return FALSE; } -/* Note: the raise argument is not really used, it doesn't seem - * possible to show a window without raising it? - */ +/* FIXME: This might be possible to simplify with client-side windows. */ static void -gdk_window_quartz_show (GdkWindow *window, - gboolean raise) +gdk_window_quartz_show (GdkWindow *window) { - GdkWindowObject *private; - GdkWindowImplQuartz *impl; + GdkWindowObject *private = (GdkWindowObject *)window; + GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); gboolean focus_on_map; - if (GDK_WINDOW_DESTROYED (window)) - return; - GDK_QUARTZ_ALLOC_POOL; - private = (GdkWindowObject *)window; - impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); - if (!GDK_WINDOW_IS_MAPPED (window)) focus_on_map = private->focus_on_map; else @@ -1087,10 +1078,7 @@ gdk_window_quartz_show (GdkWindow *window, { gboolean make_key; - /* Move the window into place, to guarantee that we get the - * initial MouseEntered event. - */ - make_key = (private->accept_focus && focus_on_map && raise && + make_key = (private->accept_focus && focus_on_map && private->window_type != GDK_WINDOW_TEMP); [(GdkQuartzWindow*)impl->toplevel showAndMakeKey:make_key]; -- 2.30.2